Skip to content
This repository was archived by the owner on Nov 6, 2023. It is now read-only.

Update merge-rulesets.sh - #12739

Merged
Hainish merged 5 commits into
masterfrom
unknown repository
Oct 27, 2017
Merged

Hainish merged 5 commits into
masterfrom
unknown repository

Conversation

@ghost

@ghost ghost commented Sep 23, 2017

Copy link
Copy Markdown

No description provided.

@ghost

ghost commented Oct 10, 2017

Copy link
Copy Markdown
Author

ping @Hainish @cowlicks.

Comment thread utils/merge-rulesets.sh Outdated
# prevents inodes from wasting disk space, but more importantly, works around
# the fact that zip does not perform well on a pile of small files.
# Merge all the .xml rulesets into a single "default.rulesets" file -- this prevents inodes from wasting disk space, but more importantly,
# works around the fact that zip does not perform well on a pile of small files.

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why this change?

Copy link
Copy Markdown
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There's no need to limit line length to 80 chars.

Copy link
Copy Markdown
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

All modern editors allow the user to choose the word wrap.

@Hainish Hainish Oct 21, 2017 •

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yet most styles still prefer it. Take PEP 8, which instructs wrapping at 79 characters. That's python, this is bash, but wrapping is still useful. Wrapping a comment line can be quite ugly in some editors. Let's keep the wrapping, it's orthogonal to the separate change in this PR.

Copy link
Copy Markdown
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@Hainish Done.

Comment thread utils/merge-rulesets.sh
RULESETS=chrome/content/rules/default.rulesets

# We make default.rulesets at build time, but it shouldn't have a variable timestamp.
touch -r src/install.rdf src/$RULESETS

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't see how this is a substantive improvement. Care to explain?

Copy link
Copy Markdown
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I moved this out of the Python script into the shell script.

@Hainish

Hainish commented Oct 27, 2017

Copy link
Copy Markdown
Member

Looks good, thanks @koops76

@Hainish
Hainish merged commit 68af6a7 into EFForg:master Oct 27, 2017
@ghost
ghost deleted the patch-62 branch October 27, 2017 05:05
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant